Unifont search in configure.ac
PATCH 1/1 Unifont search in configure.ac
Hi,
With the attached patch, unifont is searched by extension first (pcf being the preferred one), and then by directory.
The first directory being searched is `.', which allows non-root users to install ascii.pf2 and unifont.pf2 by first downloading unifont in the build directory.
Grégoire
=== modified file 'ChangeLog'
ChangeLog +4 -0
@@ -1,3 +1,7 @@ +2010-05-22 Grégoire Sutre <[email protected]> + + * configure.ac: Add `.' to the directories searched for unifont. + 2010-05-21 Vladimir Serbinenko <[email protected]> * kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
=== modified file 'configure.ac'
configure.ac +7 -5
@@ -179,11 +179,13 @@ AC_MSG_ERROR([bison is not found]) fi -for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do - if test -e $file ; then - AC_SUBST([FONT_SOURCE], [$file]) - break - fi +for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do + for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do + if test -f "$dir/unifont.$ext"; then + AC_SUBST([FONT_SOURCE], [$dir/unifont.$ext]) + break 2 + fi + done done AC_PROG_INSTALL
Go ahead
Quoted 17 lines · Grégoire Sutre
Hi,
With the attached patch, unifont is searched by extension first (pcf being the preferred one), and then by directory.
The first directory being searched is `.', which allows non-root users to install ascii.pf2 and unifont.pf2 by first downloading unifont in the build directory.
Grégoire
_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel
Signature · 2 lines
Regards Vladimir 'φ-coder/phcoder' Serbinenko